@ECHO OFF

REM Configure your favorite merge program here.
SET DIFF3="C:\Program Files\Kdiff3\kdiff3.exe"

REM Doing additional work

REM Get the paths provided by Subversion.
SET BASE=%1
SET THEIRS=%2
SET MINE=%3
SET MERGED=%4
SET WCPATH=%5

REM Call the merge command (change the following line to make sense for
REM your merge program).
%DIFF3% %BASE% %MINE% %THEIRS% -L "%WCPATH%    (base)" -L "%WCPATH%    (mine)" -L "%WCPATH%    (theirs)" -o %MERGED%

REM Return an errorcode of 0 if the conflict was resolved; 1 otherwise.
REM Any other errorcode will be treated as fatal.

REM ADDITIONAL WORK ON A TURnk
